<<<<<<< HEAD
<%--
  Created by IntelliJ IDEA.
  User: de
  Date: 2020/10/24
  Time: 16:56
  To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
    <title>Title</title>
</head>
<body>
<h2>h</h2>

</body>
</html>
=======
<%--
  Created by IntelliJ IDEA.
  User: de
  Date: 2020/10/24
  Time: 16:56
  To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
    <title>Title</title>
</head>
<body>
<h2>h</h2>

</body>
</html>
>>>>>>> 8656edbc0d8c499c6ba80dfab1beb016f2001aad
